bitkeeper revision 1.1662.1.20 (42a8054awYd-HJnwjnXqXtWmKbE1Yw)

SrvDaemon.py:
  Disable kill of xenstored on xend exit.
xu.c:
  Set error reason in failure case.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/tools/python/xen/lowlevel/xu/xu.c b/tools/python/xen/lowlevel/xu/xu.c
index c9c5b3873aa954b8f5fd60c22c1aa77a1e609698..359cb71a2def1a1ac51423e4721c12db7f627b1b 100644 (file)
--- a/tools/python/xen/lowlevel/xu/xu.c
+++ b/tools/python/xen/lowlevel/xu/xu.c
@@ -1370,7 +1370,8 @@ static PyObject *xu_port_new(PyObject *self, PyObject *args, PyObject *kwds)
 
  fail1:
     PyObject_Del((PyObject *)xup);
-    return NULL;    
+    PyErr_SetString(PyExc_ValueError, "cannot create port");
+    return NULL;
 }
 
 static PyObject *xu_port_getattr(PyObject *obj, char *name)

diff --git a/tools/python/xen/xend/server/SrvDaemon.py b/tools/python/xen/xend/server/SrvDaemon.py
index c52a8acb9d8ff7ef88e9b1caba8224d91a03dc73..133df206b936a46570dabe516f93b59c5d655889 100644 (file)
--- a/tools/python/xen/xend/server/SrvDaemon.py
+++ b/tools/python/xen/xend/server/SrvDaemon.py
@@ -130,7 +130,7 @@ class Daemon:
 
     def cleanup(self, kill=False):
         self.cleanup_xend(kill=kill)
-        self.cleanup_xenstored(kill=kill)
+        #self.cleanup_xenstored(kill=kill)
 
     def status(self):
         """Returns the status of the xend daemon.